From: Keir Fraser Date: Thu, 27 Dec 2007 23:01:50 +0000 (+0000) Subject: hvm: copy_{to,from}_user_hvm shoudl return appropriate error codes. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14445^2~86 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f53513b012968240ba490efe873982d213a85d46;p=xen.git hvm: copy_{to,from}_user_hvm shoudl return appropriate error codes. Signed-off-by: Keir Fraser --- diff --git a/xen/arch/x86/hvm/platform.c b/xen/arch/x86/hvm/platform.c index 273a2ed08a..e6ea6d9b99 100644 --- a/xen/arch/x86/hvm/platform.c +++ b/xen/arch/x86/hvm/platform.c @@ -1310,26 +1310,30 @@ DEFINE_PER_CPU(int, guest_handles_in_xen_space); deal with this. */ unsigned long copy_to_user_hvm(void *to, const void *from, unsigned len) { + int rc; + if ( this_cpu(guest_handles_in_xen_space) ) { memcpy(to, from, len); return 0; } - return hvm_copy_to_guest_virt_nofault( - (unsigned long)to, (void *)from, len); + rc = hvm_copy_to_guest_virt_nofault((unsigned long)to, (void *)from, len); + return rc ? len : 0; /* fake a copy_to_user() return code */ } unsigned long copy_from_user_hvm(void *to, const void *from, unsigned len) { + int rc; + if ( this_cpu(guest_handles_in_xen_space) ) { memcpy(to, from, len); return 0; } - return hvm_copy_from_guest_virt_nofault( - to, (unsigned long)from, len); + rc = hvm_copy_from_guest_virt_nofault(to, (unsigned long)from, len); + return rc ? len : 0; /* fake a copy_from_user() return code */ } /*